From: Wei Liu <wei.liu2@citrix.com>
Date: Mon, 22 Aug 2016 15:05:14 +0000 (+0100)
Subject: tools: only define {OVMF,SEABIOS}_PATH when they are enabled
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~520
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=ea27761b5d4c3f695fc9123bd5f815b013bac47f;p=xen.git

tools: only define {OVMF,SEABIOS}_PATH when they are enabled

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Tested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/configure b/tools/configure
index 81ccf34060..998090afb3 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4449,12 +4449,16 @@ if test "${with_system_seabios+set}" = set; then :
 
 fi
 
+if test "x$seabios" = "xy"; then :
+
 
 cat >>confdefs.h <<_ACEOF
 #define SEABIOS_PATH "${seabios_path:-$XENFIRMWAREDIR/bios.bin}"
 _ACEOF
 
 
+fi
+
 
 # Check whether --with-system-ovmf was given.
 if test "${with_system_ovmf+set}" = set; then :
@@ -4468,12 +4472,16 @@ if test "${with_system_ovmf+set}" = set; then :
 
 fi
 
+if test "x$ovmf" = "xy"; then :
+
 
 cat >>confdefs.h <<_ACEOF
 #define OVMF_PATH "${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"
 _ACEOF
 
 
+fi
+
 
 # Check whether --with-extra-qemuu-configure-args was given.
 if test "${with_extra_qemuu_configure_args+set}" = set; then :
diff --git a/tools/configure.ac b/tools/configure.ac
index c12ad79158..1fb4a55b85 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -222,9 +222,11 @@ AC_ARG_WITH([system-seabios],
         *)  seabios_path=$withval ;;
     esac
 ],[])
-AC_DEFINE_UNQUOTED([SEABIOS_PATH],
-                   ["${seabios_path:-$XENFIRMWAREDIR/bios.bin}"],
-                   [SeaBIOS path])
+AS_IF([test "x$seabios" = "xy"], [
+    AC_DEFINE_UNQUOTED([SEABIOS_PATH],
+                       ["${seabios_path:-$XENFIRMWAREDIR/bios.bin}"],
+                       [SeaBIOS path])
+])
 
 AC_ARG_WITH([system-ovmf],
     AS_HELP_STRING([--with-system-ovmf@<:@=PATH@:>@],
@@ -237,9 +239,11 @@ AC_ARG_WITH([system-ovmf],
         *)  ovmf_path=$withval ;;
     esac
 ],[])
-AC_DEFINE_UNQUOTED([OVMF_PATH],
-                   ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"],
-                   [OVMF path])
+AS_IF([test "x$ovmf" = "xy"], [
+    AC_DEFINE_UNQUOTED([OVMF_PATH],
+                       ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"],
+                       [OVMF path])
+])
 
 AC_ARG_WITH([extra-qemuu-configure-args],
     AS_HELP_STRING([--with-extra-qemuu-configure-args@<:@="--ARG1 ..."@:>@],